From 5450171a72d789234b2501dcdd7ccad98cba6d69 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 29 Feb 2020 18:50:27 +0000 Subject: [PATCH] Don't build HTML documentation in Architecture: any builds With Autotools, we would have had to leave gtk-doc-tools in the Build-Depends for gtkdocize, but with Meson we can demote it to Build-Depends-Indep. Promote docbook-xml and docbook-xsl to Build-Depends instead: they are needed in all builds for the example programs' man pages. Previously, they were pulled in by gtk-doc-tools. --- debian/control | 6 +++--- debian/control.in | 6 +++--- debian/rules | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index b7db02c2fb..ea222eb3ad 100644 --- a/debian/control +++ b/debian/control @@ -7,11 +7,12 @@ Build-Depends: adwaita-icon-theme , at-spi2-core , dbus , debhelper-compat (= 12), + docbook-xml, + docbook-xsl, dpkg-dev (>= 1.17.14), gnome-pkg-tools (>= 0.11), gobject-introspection (>= 1.41.3), gsettings-desktop-schemas , - gtk-doc-tools (>= 1.26), libatk-bridge2.0-dev, libatk1.0-dev (>= 2.15.1), libcairo2-dev (>= 1.14.0), @@ -50,8 +51,7 @@ Build-Depends: adwaita-icon-theme , xauth , xsltproc, xvfb -Build-Depends-Indep: docbook-xml, - docbook-xsl, +Build-Depends-Indep: gtk-doc-tools (>= 1.26), libatk1.0-doc, libcairo2-doc, libglib2.0-doc, diff --git a/debian/control.in b/debian/control.in index 133c0e220c..7245ce384d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -7,11 +7,12 @@ Build-Depends: adwaita-icon-theme , at-spi2-core , dbus , debhelper-compat (= 12), + docbook-xml, + docbook-xsl, dpkg-dev (>= 1.17.14), gnome-pkg-tools (>= 0.11), gobject-introspection (>= 1.41.3), gsettings-desktop-schemas , - gtk-doc-tools (>= 1.26), libatk-bridge2.0-dev, libatk1.0-dev (>= 2.15.1), libcairo2-dev (>= 1.14.0), @@ -51,8 +52,7 @@ Build-Depends: adwaita-icon-theme , xauth , xsltproc, xvfb -Build-Depends-Indep: docbook-xml, - docbook-xsl, +Build-Depends-Indep: gtk-doc-tools (>= 1.26), libatk1.0-doc, libcairo2-doc, libglib2.0-doc, diff --git a/debian/rules b/debian/rules index 88939cb82e..4b178508d2 100755 --- a/debian/rules +++ b/debian/rules @@ -99,7 +99,6 @@ configure_flags_common = \ configure_flags_deb = \ -Dbroadway-backend=true \ - -Dgtk_doc=true \ -Dinstall-tests=true \ -Dintrospection=true \ -Dman-pages=true \ @@ -120,6 +119,12 @@ else configure_flags_deb += -Dwayland-backend=false endif +ifeq ($(filter %-doc,$(built_binaries)),) +configure_flags_deb += -Dgtk_doc=false +else +configure_flags_deb += -Dgtk_doc=true +endif + configure_flags_udeb = \ -Dbroadway-backend=false \ -Dwayland-backend=false \ -- 2.30.2